Version utility class improvement and coding style
- added retained deleted files