some changes and file renaming