some restructuring and added user ids to segments
branches 95% the way there, one bug when editing segments
Merge pull request #18 from mdrewt/restructuring

Restructuring