clean up; move stuff around (into dirs) etc
further cleanup