Some changes to build script, and adding Organization class