Renaming/Identing

Renamed some classes and indented the old helmet class
Merge pull request #3 from samosaara/master

Renaming/Identing