reorganize and include mock server