Moving classes into separate files and making the template fetch response upper case