Renaming DSO in method calls to Dso for consistency
Moving creates & finds to the correct location
Making all entities public