Cleaned up and separated files
Merge pull request #2 from gobrendan/boilerplate-setup

Cleaned up and separated files