PRIS-12 #time 12h DA, Directory, IRM, & refactoring