Refactored AdapterLIB to org.osehra