files restructured
Merge pull request #24 from imlucas/restruct

Quick restructuring of files