restructure
Basics for new app