Restructure file system
Merge pull request #1 from AlecSKlein/file_restructure

Restructure file system