Some more file organization stuff
Merge