Moved files to classes folder