cleanup main dir and fix covergae