moved package into package folder
created tokens enum for string replacement of server and uri variables
refactoring and cleanup