Moved back to "app.module" - and changed folder structure