Tweaked project organization

Per our correspondence, reorganized the project with your suggestions.