some slight cleanup + removed unnecessary directories