cleanup of directories - wip for next release