Reformatted for header usage
Renamed *.h
Done. Needs testing in lab