refactor schema and collection

refactor schema, collections for cleaner organization
some cleanup of legacy code