file organization

Redid organization of files for clearer separation.