Cleanup of module filenames and directories