Reorganized namespaces, moved strings to resource, debugged