move the common controllers to common folder