Fixing Build scripts after folder structure change <Kumaran>