Further break apart server into composable pieces