diff --git a/ipaacalib/python/src/ipaaca.py b/ipaacalib/python/src/ipaaca/__init__.py
similarity index 100%
rename from ipaacalib/python/src/ipaaca.py
rename to ipaacalib/python/src/ipaaca/__init__.py
diff --git a/ipaacalib/python/src/ipaaca/util/__init__.py b/ipaacalib/python/src/ipaaca/util/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..09ce39d2190efc77cc2792c01ff62038c8fc3e95
--- /dev/null
+++ b/ipaacalib/python/src/ipaaca/util/__init__.py
@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+'''
+This file intentionally left blank (for now)
+
+@author: ryaghoub
+'''
+
+
diff --git a/ipaacalib/python/src/notifier.py b/ipaacalib/python/src/ipaaca/util/notifier.py
similarity index 98%
rename from ipaacalib/python/src/notifier.py
rename to ipaacalib/python/src/ipaaca/util/notifier.py
index d204c74c2c23fd8f39db9b0648d849c4d5212818..7f3f832af9339ac5b0ecb8639327707b07508ec5 100644
--- a/ipaacalib/python/src/notifier.py
+++ b/ipaacalib/python/src/ipaaca/util/notifier.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 '''
 Created on Dec 20, 2012
 
@@ -68,8 +70,5 @@ class ComponentNotifier(object):
                 self.inBuffer.register_handler(self._handle_iu_event, [IUEventType.MESSAGE], ComponentNotifier.NOTIFY_CATEGORY)
                 self._submit_notify(True)
                 self.initialized = True
-            
-    
-    
-            
-        
\ No newline at end of file
+
+
diff --git a/ipaacalib/python/test/src/testnotifier.py b/ipaacalib/python/test/src/testnotifier.py
index 7b3f8ac19b3fed5fc32d418823624223cef96410..6d13d584cce601a16919529184e6e1f9435b6f63 100644
--- a/ipaacalib/python/test/src/testnotifier.py
+++ b/ipaacalib/python/test/src/testnotifier.py
@@ -9,12 +9,12 @@ from mockito import verify
 from mockito import any
 from mockito import when
 from mockito import times
-from notifier import ComponentNotifier
 from hamcrest.core.base_matcher import BaseMatcher
 from ipaaca import IUEventType
 from ipaaca import Message
 from ipaaca import InputBuffer
 from ipaaca import OutputBuffer
+from ipaaca.util.notifier import ComponentNotifier
 import time
 import os
 
@@ -120,4 +120,5 @@ class ComponentNotifierIntegrationTest(unittest.TestCase):
 if __name__ == "__main__":
     #import sys;sys.argv = ['', 'Test.testName']
     unittest.main()
-    os._exit(0) 
\ No newline at end of file
+    os._exit(0)
+