Subfile Conversion

DONE

Converting the file structure to use the subfiles package

closes #3