Merged app in new Cake framework

Merging the app files into the new framwork.