Added logging, and moved Core into single project.