Fixed the references to simpl / renamed namespaces, cleaned up issues w/ oodss wrt those refactorings