Restructure Server App