Moving functions around, new function files