Adjust SCSS and move some controllers around.