Merge pull request #1 from katzkode/file-split

File split
Restructuring