restructured such that modules are in root