Too many changes\!
A few more changes (deletions/renames)