Remove anything OSX'y and move some stuff about