Put some of plotting into separate file

More to do!