Move server to seperate and make it a module