(Unless you meant moving the class name into the SoftwareSpec namespace)