Move modules around to better places