Removed shape module, fixed unit tests
Merge pull request #742 from bvssvni/newdesign

Removed shape module, fixed unit tests