Added packages and fixed project references;