Updated project directory structure
Merge branch 'master' of git://github.com/Toyon/Chilipepper