Files merged from ship-simu project