Fixes for renaming issues

1. From diagram changed to package
2. Rename lost all cointained componenets etc etc
7 files changed