Cleaning up modules from the old directory struct