Change 'app' module to 'lib'
Fix imports
Merge branch 'feature_lib-folder' into dev