Refactor App:: controllers structure