More directives and boomstrap renaming