- reorganized header files
- added Tests for MainViewController