directories now use correct names
Merge branch 'liquid/2.x' of git://github.com/ibidem/mjolnir-access into liquid/2.x