Moved files to folder
Added more classes