Not sure how this worked before
Split up build process
Less tightly coupled datafile call generation for .py files