Better directory structure.