restructured module files