Package refactor and dependencies removed