Renaming/Identing

Renamed some classes and indented the old helmet class