Revert "removed - cleaned up old modles"

This reverts commit 493e9fa6169123c49830bf83c6b0395599e666ef.
Revert "removed - cleaned up old controllers"

This reverts commit 18e1f6ee018b358e4f5352c3caba8008179add9b.