Move stuff around to suit server, also try not to have issues with recursive dependencies