reorganize ships functionality
Merge pull request #6 from amedeedaboville/charlieSetup

reorganize ships functionality