reorganizing a bit, README, maybe cleanup