Server module refactor; Control module refactor;