Restructure project files for consistency
Resolve merge conflicts
Merge pull request #12 from nickb1080/master

Restructure project files for consistency.