diff --git a/setools/__init__.py b/setools/__init__.py
index 9acdc36..b5b32be 100644
--- a/setools/__init__.py
+++ b/setools/__init__.py
@@ -24,30 +24,30 @@ except:
__version__ = "unknown"
# Python classes for policy representation
-import policyrep
-from policyrep import SELinuxPolicy
+from . import policyrep
+from .policyrep import SELinuxPolicy
# Component Queries
-import commonquery
-import objclassquery
-import typequery
-import rolequery
-import userquery
-import boolquery
-import polcapquery
-import permissivequery
+from . import commonquery
+from . import objclassquery
+from . import typequery
+from . import rolequery
+from . import userquery
+from . import boolquery
+from . import polcapquery
+from . import permissivequery
# Rule Queries
-import terulequery
-import rbacrulequery
-import mlsrulequery
+from . import terulequery
+from . import rbacrulequery
+from . import mlsrulequery
# In-policy Context Queries
-import initsidquery
+from . import initsidquery
# Information Flow Analysis
-import infoflow
-import permmap
+from . import infoflow
+from . import permmap
# Domain Transition Analysis
-import dta
+from . import dta
diff --git a/setools/boolquery.py b/setools/boolquery.py
index 70d1c7c..e694c06 100644
--- a/setools/boolquery.py
+++ b/setools/boolquery.py
@@ -18,7 +18,7 @@
#
import re
-import compquery
+from . import compquery
class BoolQuery(compquery.ComponentQuery):
diff --git a/setools/commonquery.py b/setools/commonquery.py
index d34ffa0..952493d 100644
--- a/setools/commonquery.py
+++ b/setools/commonquery.py
@@ -18,7 +18,7 @@
#
import re
-import compquery
+from . import compquery
class CommonQuery(compquery.ComponentQuery):
diff --git a/setools/compquery.py b/setools/compquery.py
index b21a76d..2d05812 100644
--- a/setools/compquery.py
+++ b/setools/compquery.py
@@ -18,7 +18,7 @@
#
import re
-import query
+from . import query
class ComponentQuery(query.PolicyQuery):
diff --git a/setools/contextquery.py b/setools/contextquery.py
index acbb189..d36ef01 100644
--- a/setools/contextquery.py
+++ b/setools/contextquery.py
@@ -18,7 +18,7 @@
#
import re
-import query
+from . import query
class ContextQuery(query.PolicyQuery):
diff --git a/setools/infoflow.py b/setools/infoflow.py
index 32681fd..dd84411 100644
--- a/setools/infoflow.py
+++ b/setools/infoflow.py
@@ -18,10 +18,11 @@
#
import itertools
-import policyrep
-import permmap
import networkx as nx
+from . import policyrep
+from . import permmap
+
class InfoFlowAnalysis(object):
diff --git a/setools/initsidquery.py b/setools/initsidquery.py
index 4b9ddf8..2582420 100644
--- a/setools/initsidquery.py
+++ b/setools/initsidquery.py
@@ -16,8 +16,8 @@
# License along with SETools. If not, see
# .
#
-import compquery
-import contextquery
+from . import compquery
+from . import contextquery
class InitialSIDQuery(compquery.ComponentQuery, contextquery.ContextQuery):
diff --git a/setools/mlsrulequery.py b/setools/mlsrulequery.py
index 2443737..9da26e3 100644
--- a/setools/mlsrulequery.py
+++ b/setools/mlsrulequery.py
@@ -16,7 +16,7 @@
# License along with SETools. If not, see
# .
#
-import rulequery
+from . import rulequery
class MLSRuleQuery(rulequery.RuleQuery):
diff --git a/setools/objclassquery.py b/setools/objclassquery.py
index 842fba8..f79e665 100644
--- a/setools/objclassquery.py
+++ b/setools/objclassquery.py
@@ -18,8 +18,8 @@
#
import re
-import compquery
-from policyrep.objclass import NoCommon
+from . import compquery
+from .policyrep.objclass import NoCommon
class ObjClassQuery(compquery.ComponentQuery):
diff --git a/setools/permissivequery.py b/setools/permissivequery.py
index f03ce54..759e516 100644
--- a/setools/permissivequery.py
+++ b/setools/permissivequery.py
@@ -18,7 +18,7 @@
#
import re
-import compquery
+from . import compquery
class PermissiveQuery(compquery.ComponentQuery):
diff --git a/setools/permmap.py b/setools/permmap.py
index cc74d5a..b961a58 100644
--- a/setools/permmap.py
+++ b/setools/permmap.py
@@ -18,7 +18,8 @@
#
from sepolgen import objectmodel as om
-import policyrep
+
+from . import policyrep
# build off of sepolgen perm map implementation
diff --git a/setools/polcapquery.py b/setools/polcapquery.py
index 9f939ec..a463d8c 100644
--- a/setools/polcapquery.py
+++ b/setools/polcapquery.py
@@ -18,7 +18,7 @@
#
import re
-import compquery
+from . import compquery
class PolCapQuery(compquery.ComponentQuery):
diff --git a/setools/policyrep/__init__.py b/setools/policyrep/__init__.py
index b2a0f3b..7704410 100644
--- a/setools/policyrep/__init__.py
+++ b/setools/policyrep/__init__.py
@@ -21,7 +21,7 @@
# abstractions and methods for accessing the policy
# structures.
-import qpol
+from . import qpol
# The libqpol SWIG class is not quite natural for
# Python, since void* are passed around from the
@@ -35,26 +35,26 @@ import qpol
# be valid for the policy it comes from.
# Components
-import objclass
-import typeattr
-import boolcond
-import role
-import user
-import mls
-import polcap
+from . import objclass
+from . import typeattr
+from . import boolcond
+from . import role
+from . import user
+from . import mls
+from . import polcap
# Rules
-import terule
-import rbacrule
-import mlsrule
+from . import terule
+from . import rbacrule
+from . import mlsrule
# Constraints
-import constraint
+from . import constraint
# In-policy Labeling
-import initsid
-import fscontext
-import netcontext
+from . import initsid
+from . import fscontext
+from . import netcontext
class SELinuxPolicy(object):
diff --git a/setools/policyrep/boolcond.py b/setools/policyrep/boolcond.py
index d214151..6e5d129 100644
--- a/setools/policyrep/boolcond.py
+++ b/setools/policyrep/boolcond.py
@@ -16,9 +16,10 @@
# License along with SETools. If not, see
# .
#
-import qpol
import string
-import symbol
+
+from . import qpol
+from . import symbol
class Boolean(symbol.PolicySymbol):
diff --git a/setools/policyrep/constraint.py b/setools/policyrep/constraint.py
index 140d20c..648ad2e 100644
--- a/setools/policyrep/constraint.py
+++ b/setools/policyrep/constraint.py
@@ -18,9 +18,9 @@
#
import string
-import qpol
-import symbol
-import objclass
+from . import qpol
+from . import symbol
+from . import objclass
class Constraint(symbol.PolicySymbol):
diff --git a/setools/policyrep/context.py b/setools/policyrep/context.py
index 80e6c0d..28b1996 100644
--- a/setools/policyrep/context.py
+++ b/setools/policyrep/context.py
@@ -16,12 +16,12 @@
# License along with SETools. If not, see
# .
#
-import qpol
-import symbol
-import user
-import role
-import typeattr
-import mls
+from . import qpol
+from . import symbol
+from . import user
+from . import role
+from . import typeattr
+from . import mls
class Context(symbol.PolicySymbol):
diff --git a/setools/policyrep/fscontext.py b/setools/policyrep/fscontext.py
index 5786f98..0da1fab 100644
--- a/setools/policyrep/fscontext.py
+++ b/setools/policyrep/fscontext.py
@@ -16,9 +16,9 @@
# License along with SETools. If not, see
# .
#
-import qpol
-import symbol
-import context
+from . import qpol
+from . import symbol
+from . import context
class FSContext(symbol.PolicySymbol):
diff --git a/setools/policyrep/initsid.py b/setools/policyrep/initsid.py
index 5742b66..caba570 100644
--- a/setools/policyrep/initsid.py
+++ b/setools/policyrep/initsid.py
@@ -16,9 +16,9 @@
# License along with SETools. If not, see
# .
#
-import qpol
-import symbol
-import context
+from . import qpol
+from . import symbol
+from . import context
class InitialSID(symbol.PolicySymbol):
diff --git a/setools/policyrep/mls.py b/setools/policyrep/mls.py
index c466f00..dc1c83c 100644
--- a/setools/policyrep/mls.py
+++ b/setools/policyrep/mls.py
@@ -19,8 +19,8 @@
import itertools
import string
-import qpol
-import symbol
+from . import qpol
+from . import symbol
class MLSDisabled(symbol.InvalidSymbol):
diff --git a/setools/policyrep/mlsrule.py b/setools/policyrep/mlsrule.py
index 345a0e4..303120d 100644
--- a/setools/policyrep/mlsrule.py
+++ b/setools/policyrep/mlsrule.py
@@ -16,12 +16,12 @@
# License along with SETools. If not, see
# .
#
-import qpol
-import rule
-import typeattr
-import mls
-import objclass
-import boolcond
+from . import qpol
+from . import rule
+from . import typeattr
+from . import mls
+from . import objclass
+from . import boolcond
class MLSRule(rule.PolicyRule):
diff --git a/setools/policyrep/netcontext.py b/setools/policyrep/netcontext.py
index b88441e..1b54fff 100644
--- a/setools/policyrep/netcontext.py
+++ b/setools/policyrep/netcontext.py
@@ -18,9 +18,9 @@
#
import socket
-import qpol
-import symbol
-import context
+from . import qpol
+from . import symbol
+from . import context
class NetContext(symbol.PolicySymbol):
diff --git a/setools/policyrep/objclass.py b/setools/policyrep/objclass.py
index d82d89e..1bb63f3 100644
--- a/setools/policyrep/objclass.py
+++ b/setools/policyrep/objclass.py
@@ -16,8 +16,8 @@
# License along with SETools. If not, see
# .
#
-import symbol
-import qpol
+from . import symbol
+from . import qpol
class Common(symbol.PolicySymbol):
diff --git a/setools/policyrep/polcap.py b/setools/policyrep/polcap.py
index 838475b..7f8a94a 100644
--- a/setools/policyrep/polcap.py
+++ b/setools/policyrep/polcap.py
@@ -16,8 +16,8 @@
# License along with SETools. If not, see
# .
#
-import qpol
-import symbol
+from . import qpol
+from . import symbol
class PolicyCapability(symbol.PolicySymbol):
diff --git a/setools/policyrep/rbacrule.py b/setools/policyrep/rbacrule.py
index 1f88d2b..08c8d5c 100644
--- a/setools/policyrep/rbacrule.py
+++ b/setools/policyrep/rbacrule.py
@@ -16,11 +16,11 @@
# License along with SETools. If not, see
# .
#
-import qpol
-import rule
-import role
-import typeattr
-import objclass
+from . import qpol
+from . import rule
+from . import role
+from . import typeattr
+from . import objclass
class RBACRule(rule.PolicyRule):
diff --git a/setools/policyrep/role.py b/setools/policyrep/role.py
index 1c91901..6efb576 100644
--- a/setools/policyrep/role.py
+++ b/setools/policyrep/role.py
@@ -17,9 +17,10 @@
# .
#
import string
-import qpol
-import symbol
-import typeattr
+
+from . import qpol
+from . import symbol
+from . import typeattr
class Role(symbol.PolicySymbol):
diff --git a/setools/policyrep/rule.py b/setools/policyrep/rule.py
index 0585015..0bad847 100644
--- a/setools/policyrep/rule.py
+++ b/setools/policyrep/rule.py
@@ -16,8 +16,8 @@
# License along with SETools. If not, see
# .
#
-import qpol
-import symbol
+from . import qpol
+from . import symbol
class InvalidRuleUse(Exception):
diff --git a/setools/policyrep/symbol.py b/setools/policyrep/symbol.py
index 0d04020..b19b2e8 100644
--- a/setools/policyrep/symbol.py
+++ b/setools/policyrep/symbol.py
@@ -16,7 +16,7 @@
# License along with SETools. If not, see
# .
#
-import qpol
+from . import qpol
class InvalidSymbol(Exception):
diff --git a/setools/policyrep/terule.py b/setools/policyrep/terule.py
index a4a8f7b..861870c 100644
--- a/setools/policyrep/terule.py
+++ b/setools/policyrep/terule.py
@@ -18,12 +18,12 @@
#
import string
-import qpol
-import symbol
-import rule
-import typeattr
-import objclass
-import boolcond
+from . import qpol
+from . import symbol
+from . import rule
+from . import typeattr
+from . import objclass
+from . import boolcond
class TERuleNoFilename(Exception):
diff --git a/setools/policyrep/typeattr.py b/setools/policyrep/typeattr.py
index c9bb8eb..42c4972 100644
--- a/setools/policyrep/typeattr.py
+++ b/setools/policyrep/typeattr.py
@@ -18,8 +18,8 @@
#
import string
-import qpol
-import symbol
+from . import qpol
+from . import symbol
class TypeAttr(symbol.PolicySymbol):
diff --git a/setools/policyrep/user.py b/setools/policyrep/user.py
index 15ebf89..b4369e6 100644
--- a/setools/policyrep/user.py
+++ b/setools/policyrep/user.py
@@ -19,10 +19,10 @@
import string
-import qpol
-import role
-import mls
-import symbol
+from . import qpol
+from . import role
+from . import mls
+from . import symbol
class User(symbol.PolicySymbol):
diff --git a/setools/rbacrulequery.py b/setools/rbacrulequery.py
index b99ea3f..66d7091 100644
--- a/setools/rbacrulequery.py
+++ b/setools/rbacrulequery.py
@@ -16,8 +16,8 @@
# License along with SETools. If not, see
# .
#
-from policyrep.rule import InvalidRuleUse
-import rulequery
+from .policyrep.rule import InvalidRuleUse
+from . import rulequery
class RBACRuleQuery(rulequery.RuleQuery):
diff --git a/setools/rolequery.py b/setools/rolequery.py
index b23890d..df6a86a 100644
--- a/setools/rolequery.py
+++ b/setools/rolequery.py
@@ -18,7 +18,7 @@
#
import re
-import compquery
+from . import compquery
class RoleQuery(compquery.ComponentQuery):
diff --git a/setools/rulequery.py b/setools/rulequery.py
index 0c15ec6..c644d4e 100644
--- a/setools/rulequery.py
+++ b/setools/rulequery.py
@@ -18,7 +18,7 @@
#
import re
-from query import PolicyQuery
+from .query import PolicyQuery
class RuleQuery(PolicyQuery):
diff --git a/setools/terulequery.py b/setools/terulequery.py
index cd69aff..e72eb45 100644
--- a/setools/terulequery.py
+++ b/setools/terulequery.py
@@ -16,8 +16,8 @@
# License along with SETools. If not, see
# .
#
-from policyrep.rule import InvalidRuleUse
-import rulequery
+from .policyrep.rule import InvalidRuleUse
+from . import rulequery
class TERuleQuery(rulequery.RuleQuery):
diff --git a/setools/typequery.py b/setools/typequery.py
index 7f91b15..e9bd74d 100644
--- a/setools/typequery.py
+++ b/setools/typequery.py
@@ -18,7 +18,7 @@
#
import re
-import compquery
+from . import compquery
class TypeQuery(compquery.ComponentQuery):
diff --git a/setools/userquery.py b/setools/userquery.py
index 0dfe165..627ed47 100644
--- a/setools/userquery.py
+++ b/setools/userquery.py
@@ -18,7 +18,7 @@
#
import re
-import compquery
+from . import compquery
class UserQuery(compquery.ComponentQuery):
diff --git a/tests/__init__.py b/tests/__init__.py
index d70a651..037c530 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -15,16 +15,16 @@
# You should have received a copy of the GNU General Public License
# along with SETools. If not, see .
#
-import boolquery
-import commonquery
-import dta
-import initsidquery
-import objclassquery
-import polcapquery
-import permissivequery
-import infoflow
-import terulequery
-import rbacrulequery
-import typequery
-import rolequery
-import userquery
+from . import boolquery
+from . import commonquery
+from . import dta
+from . import initsidquery
+from . import objclassquery
+from . import polcapquery
+from . import permissivequery
+from . import infoflow
+from . import terulequery
+from . import rbacrulequery
+from . import typequery
+from . import rolequery
+from . import userquery