Moved some things around

Moved some things around from 'no one checked yet', as this can be checked from the CDR. All do lack proper configs or actual binaries/data though.