adapt to new app scaffolding file arragement