Added a controller
Managed the import to regroup module import