fix issue #10 and removed unnecessary directories