Server stuff, moved admin packages around to avoid naming conflicts