Changed/Rename some files for make it workable