Solution structure changed. Main project now provided as library. Some tests added