minor changes and file rename
renaming