Generate sources in . folder not in cpp folder

Change-Id: I9586b269bc353edda72a417f56644740875eda60