More refactoring

Temporarily moving to the new build settings for quicker testing
Updating generate import command
More refactoring to the Helper class (regex)