Move some modules to other directories