Fixed Issue #148 - moved generated interfaces into a single assembly