Fixed build issues.
Rearranged into two projects one for the library and one for tests.
Removed namespace Core.
Merged changes.