Changed some class names, split controller