files renamed and some corrected errors