Move some things around structure-wise