DJ and Charles: restructured the files for the new python project