Refactoring into single assembly