Restructure server modules