Reorganization and Location Progress

Class names can’t have a dash in them.
Oops. I’ve never thought about that before.