REST package refactoring and Documentation