Refactor instance class back into server