Merging new organization into master

At this point there's not much point in exploring the old organization. Better just go with something that at least seems to work.