More minor clean up.
Fixed failing unit tests...
Added solution and project representation.