Roughing out.
More cleanup in directories.