Moved mason and modules from feature to its own folder and updated the Catalyst controller accordingly