From f2d7b5a62a4bb7b3b5383b9409579f7592d35a27 Mon Sep 17 00:00:00 2001
From: Joshua Boniface <joshua@boniface.me>
Date: Thu, 14 Jun 2018 12:07:46 -0400
Subject: [PATCH] More cleanup of stuff to make the pvcd module

---
 pvc.py                                 | 10 +++++++++-
 NodeInstance.py => pvc/NodeInstance.py |  0
 VMInstance.py => pvc/VMInstance.py     |  0
 pvc/__init__.py                        |  0
 ansiiprint.py => pvc/ansiiprint.py     |  0
 pvcd.py                                |  7 ++++---
 6 files changed, 13 insertions(+), 4 deletions(-)
 rename NodeInstance.py => pvc/NodeInstance.py (100%)
 rename VMInstance.py => pvc/VMInstance.py (100%)
 create mode 100644 pvc/__init__.py
 rename ansiiprint.py => pvc/ansiiprint.py (100%)

diff --git a/pvc.py b/pvc.py
index 91f54a78..b04f0e90 100755
--- a/pvc.py
+++ b/pvc.py
@@ -20,7 +20,15 @@
 #
 ###############################################################################
 
-import kazoo.client, os, socket, time, click, lxml.objectify, ansiiprint, configparser
+import os
+import socket
+import time
+import click
+import lxml.objectify
+import configparser
+import kazoo.client
+
+import pvc.ansiiprint as ansiiprint
 
 ###############################################################################
 # Supplemental functions
diff --git a/NodeInstance.py b/pvc/NodeInstance.py
similarity index 100%
rename from NodeInstance.py
rename to pvc/NodeInstance.py
diff --git a/VMInstance.py b/pvc/VMInstance.py
similarity index 100%
rename from VMInstance.py
rename to pvc/VMInstance.py
diff --git a/pvc/__init__.py b/pvc/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/ansiiprint.py b/pvc/ansiiprint.py
similarity index 100%
rename from ansiiprint.py
rename to pvc/ansiiprint.py
diff --git a/pvcd.py b/pvcd.py
index e8f00696..3a2dbcc5 100755
--- a/pvcd.py
+++ b/pvcd.py
@@ -28,13 +28,14 @@ import socket
 import psutil
 import subprocess
 import uuid
-import VMInstance
-import NodeInstance
 import time
 import atexit
 import configparser
 import apscheduler.schedulers.background
-import ansiiprint
+
+import pvc.ansiiprint as ansiiprint
+import pvc.VMInstance as VMInstance
+import pvc.NodeInstance as NodeInstance
 
 print(ansiiprint.bold() + "pvcd - Parallel Virtual Cluster management daemon" + ansiiprint.end())