Refactored Package Organization added new Branching and XPATH Stub