Overall Cleanup

This is an overall cleanup to bring shipright into a consumable state by other engineers.