Move internal server into sepperate package