restructured module folders and module loader