Organize the source code
Cleanup one class to retrieve the URI