Remove unused modules and remove modules being placed in modules sub-directories.