alittle splitted mstorectl code; etc

Makefile.am

@@ -7,13 +7,10 @@ bin_PROGRAMS = mstorectl
 sbin_PROGRAMS = mstored
 
 mstorectl_SOURCES = \
-	cmd/mstorectl/main.go
+	cmd/mstorectl/main.go \
+	cmd/mstorectl/util.go
 
-EXTRA_mstorectl_SOURCES = \
-	cmd/mstorectl/command/accountcmd.go \
-	cmd/mstorectl/command/grantcmd.go \
-	cmd/mstorectl/command/imagecmd.go \
-	cmd/mstorectl/command/util.go
+EXTRA_mstorectl_SOURCES = 
 
 
 mstored_SOURCES = cmd/mstored/main.go
@@ -66,23 +63,6 @@ EXTRA_mstored_SOURCES += \
 	app/maindb/manifest.go \
 	app/maindb/scheme.go \
 	\
-	app/operator/account.go \
-	app/operator/blob.go \
-	app/operator/grant.go \
-	app/operator/imgaux.go \
-	app/operator/manifest.go \
-	app/operator/ociaux.go \
-	app/operator/operator.go \
-	app/operator/service.go \
-	app/operator/version.go \
-	app/router/bindobj.go \
-	app/router/context.go \
-	app/router/corsmw.go \
-	app/router/loggingmw.go \
-	app/router/pathc.go \
-	app/router/recovermw.go \
-	app/router/router.go \
-	\
 	app/server/server.go \
 	app/service/service.go \
 	app/storage/storage.go \
@@ -99,9 +79,9 @@ EXTRA_mstored_SOURCES += \
 	pkg/auxutar/utar.go \
 	pkg/auxuuid/uuid.go \
 	pkg/auxx509/x509cert.go \
+	\
 	pkg/client/account.go \
 	pkg/client/client.go \
-	pkg/client/fileaux.go \
 	pkg/client/grant.go \
 	pkg/client/httpcall.go \
 	pkg/client/imageaux.go \