Finish Refactor, redesign authorization-server