Moving a bunch of stuff around

Navigation not updated yet, this commit is a bit of a mess. Will do
smaller changes in future!