build.sh update, cli, entity, and structure changes