Moving some stuff around. I need to make the old version work before changing names on tables, functions and fields.