New Organization

Minor changes. Initial training seems to be working.