Remove chsmack + fix surplus directories