Small directory and formatting changes