More cleanup and add missing empty dirs