consolidated files, added directives