Trying to cleanup the export vs source folder concept

* these 2 concepts were too intertwined