Modularize controllers