New project structure
Merge of the repositories
AppEngine not working