Cleaned up sessions module, ported resume to new module.