dir and gradle cleanup