Reorganizing

Moving some things around in the skeleton