moved code from __init__.py to modules