Cleanup, sort into files, support cascading objects in MapStorage.