Major clean-ups of the directory