Move module file into module directory and remove subdirectory