Fixes directory.
Moderate cleanup