@theopolis I can work with @alessandrogario on getting more of those files relocated appropriately and testing that whole framework out