Rename Helper folder and add controller resolver