Restored module 'dmr'
Restored module 'flow'
Restored module 'spi'
Restored module 'app'
Restored module 'app'
Tweak maven compiler settings
Merge branch 'feature/oldPackageNames' into develop