Fixed fallback formatting and changed dir structure