Systems refactored, swmath URIs added