Major cleanup up filesystem.
More confusion.