added .h and restructured