Remove logging and decorators from __init__
Add logging and decorator modules