Major rework. Migrating to POCO.
remove module