Merge basic organization entity implementation into master