Subfile Conversion

no done yet! 

This is converting the file structure to use the subfiles package