Split up those megafiles!
Merge pull request #3 from thenewtricks/file-refactor

File refactor