[REFACTOR] Changed architecture to work on google app engine