Refactored the addin part into its own assembly.