Changed architecture to MVC and removed 'token file'