Refactored #import section for Controllers