Align entries, and add acc dir creation