Created separated controllers for feature.

Created separated controllers for feature.