Nicer directory structure.