Issue #118, remove extra classes directory