Refactored schemas to new namespace