Moving some things around. Deleting others