Regenrated the branch (rebase failed)
Fixed the module copy path
Removed autotools makefile template