folder reorg and adding modules part