Folder rename and big cleanup commit - server and client updated to current deployed version on nuc (autoupdates)
