added substrates layer creation to packager
fixing up substrates layer
substrate layer fixups