Refactor to controllers!
Merge pull request #1 from MikaAK/master

Refactor to controllers!