client: cleanup and bug fix
models: cleanup
tests: updating tests
model: Cleanup, bugfix and refactoring
models:Fixed dependency problem
Working on upload
test: cleanup and new upload test