Moving some things around for better structure