Refactoring

Allows use of this assembly in other projects.