Updated controller structure and deleted countries
Merge pull request #5 from mex/controller-structure

Updates controller structure and deletes countries