Navigation in packages and some minor refactor