Organized directories to something sane