Organized folder and file, deleted useless class.