Restructuring
Merge pull request #2 from katzkode/file-split

Restructuring