Fixed build system according to folder structure update
Update autogen script according to foldere structure update