App module

AppModule branch should be merged to master (v 6.0 beta)