Put remote module into pkg root

bootstrap-vz-remote

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
 
 if __name__ == '__main__':
-	from bootstrapvz.base.remote.remote import main
+	from bootstrapvz.remote.main import main
 	main()

bootstrap-vz-server

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
 
 if __name__ == '__main__':
-	from bootstrapvz.base.remote.server import main
+	from bootstrapvz.remote.server import main
 	main()

bootstrapvz/remote/main.py

@@ -46,6 +46,8 @@ Options:
                      If <path> is `-' file logging will be disabled.
   --pause-on-error   Pause on error, before rollback
   --dry-run          Don't actually run the tasks
+  --color=auto|always|never
+                     Colorize the console output [default: auto]
   --debug            Print debugging information
   -h, --help         show this help
 	"""

tests/integration/tools/__init__.py

@@ -4,7 +4,7 @@ from build_servers import RemoteBuildServer
 
 # Register deserialization handlers for objects
 # that will pass between server and client
-from bootstrapvz.base.remote import register_deserialization_handlers
+from bootstrapvz.remote import register_deserialization_handlers
 register_deserialization_handlers()
 
 
@@ -47,7 +47,7 @@ def bootstrap(manifest, build_server):
 		from bootstrapvz.base.main import run
 		bootstrap_info = run(manifest)
 	else:
-		from bootstrapvz.base.remote.remote import run
+		from bootstrapvz.remote.main import run
 		bootstrap_info = run(manifest, build_server.settings)
 	return bootstrap_info