Updated the rest of the boats to the new system, refactored a class name and removed unused classes