Moving to folder for proper module name