Move code around.
Move code around.

Liwink/schema,skorokithakis/schema,lzjun567/schema,Abd4llA/schema,bcaudell95/schema,werehuman/schema,dylanninin/schema,a-saad/schema,keleshev/schema,kurtbrose/schema,jab/schema,sjakobi/schema,AdamCanady/schema