reorganized models/views