User Controls in separate classes

User controls are now in separate classes.