Refactor Schema package