Refactored and renamed area controllers