Redesigning hierarhy initial commit
Total cleanup.
Merge pull request #3 from ashamin/develop

Develop