Changed Module name, directory structure