Also, start the reorganization of artigen to support nesting better, make smaller more readable files, and better named functions