Refactored more constant variable naming
Moved Regx into correct fucntion
Moved logic which checked if a path was specitifed in app
Refactored Waterfall Properly into separate modules