updating file and folder structures, reorganizing almost all modules