Added more directories and formatted.