clean-up dirs rewrite
version bump