02.08.2014 From Notebook. Work in progress ...
- Package structure changed