Re-orgs code to have factory constructor at start of file
Re-orgs code to have factory constructor at start of file

manueltimita/Windshaft,CartoDB/Windshaft,HydroLogic/Windshaft,manueltimita/Windshaft,HydroLogic/Windshaft,CartoDB/Windshaft,wsw0108/Windshaft,wsw0108/Windshaft,manueltimita/Windshaft,CartoDB/Windshaft,HydroLogic/Windshaft,wsw0108/Windshaft