Reorganising

This was taken after the messiest bit! At this point order is starting to reassert itself but there’s still a way to go!