Added more elpa dependencies and removed sub modules