Moved a lot of stuff around (hopefully the last time)