cleaned up dir names