Server stuff and massive reorganization.