Renameing User to Worker, Company to Client
Miscelaneous corrections.
Removing conflicting file.