Location and Ships Classes
Revert "Location and Ships Classes"

This reverts commit 29832084e862b26303159e1d6ccd9bfb2a74483d.