Move some definitions around
A whole bunch of work on getting memory management implemented