fix directory structure to be sane
cleanup. make it simpler to use proc_iter externally.