updated organization a little bit, also check out mockup on balsamiq