Moved control and category models to models folder
Removing unused code from control and category models