Updates

Additional models, some reorganizing, and fixing some bugs due to
deletion of redirects for simpler file management.