Reorganized models, created new Activator classes.