Refactor dependencies for new core code base