More deleting and reorganising

because I don't know how to fix our actual problems