Some small changes
Fixed some Dropbox things
Resolving problems and conflicts
Rearaganged files