module name change and overall cleaning