changed naming convention for module files
removed unnecessary codes