Organized files and added some pShipx of Type1