Move modules to load earlier