changed app structure, lib / app are main folders, module spaces underneath