Refactor package locations to clean up dependency management a bit