Fixed some naming conventions
Added first class design and legend file