updating directory structure and clearning old code
Authored by: elaphemo 2014-03-05
Parent: [r40]
Child: [r42]