Changed classes and file names, placed in drafts folder