fix difference with new repository in server.go
new organize folders
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	lib/server/server.go