Split module that includes export * from "dep" statement (#992)

Split module that includes export * from "dep" statement (#992) #225