Refactoring boat stuff to sub package