restructure - ctrl-c

bug remaining - ratemap size is wrong