Move code around to follow our standard layout.
Merge branch 'schema-changes' of github.com:materials-commons/mcfs into schema-changes