Restructure Files
Merge pull request #1 from zserafini/file_structure

Restructure Files