dir and code cleanup, doc tweaks