totally refactored controllers, generator concern and simplified actions