Even more cleanups. Extracted some stuff into new files and added a VClock implicit value class