Correct class names.
Move all UI forms to into view package.