Removing unnecessary src dir. Also fix issue #40