Removing stupid dlls.
Refactored data classes to reuse common functionality.