Moved lib/src to lib/inc.
s|/src/|/inc/|, as appropriate, small naming updates.