Created new Exceptions for the new class files
Added new references to the project
Removed classes and renamed the namespaces