Modules structure cleanup + testApp removed