Updating layout
Changing working dir for build
Updating linux_init.sh
Fixing osx_init path
Merge branch 'dev-generic'

Fixing paths, build scripts