Reordering/Renaming of some files
some changes