merging sbsys and edoc modules