Refactoring modules
Removing pyc