jason merge

re-org'd the projects.  also removed img2 functions.