rename, remove unused modules