Refactored package contents (still ongoing) and eliminated dependencies
from "api"