some minor reorg
cleanup of unnecessary files