Reorganised some stuff

Still awaiting on Nialls stuff and waiting for you to do something chris
you lazy person :p