Refactor resource URI handling
Add @@TODO comments for annotation updates
Added logging setup to command line wrappers; reduce web service logghing level