Refactoring into 'shuttle' package.