Refactoring and fixed project assembly references.