Move around dependencies to prepare for production/optimization.