refactored navigation, package system