created lots of hierarchy in packages.
removed all errors/warnings except demcsteptest
commented out tests, need to fix.