De-commented, and added new organizational structure code