#1 fix folders
Merge branch 'master' of github.com:bedita/boilerplate
 #1 fix folders