Using a better directory structure.