Cleaned up directory structure
Merge pull request #1 from wtcross/cleanup

Cleaned up directory structure