Added separate projects. Added UoW