Moved files to User-Class folder