Removing extra subdirs