Refactor the app scaffolding directory structure
Remove now unneeded files