Add repository package, Update some classes