changed dir creation, templates, ordering