Cleaning up files and directories.
Merge pull request #38 from david-on-github/David-Dev

Cleaning up files and directories.