Correction in plotting.h
Little changes commited from all files. Cleanup in the lib directory - files moved associated with different blocks moved to associated directories.