Changed package structure
Added __init__.py
Merge branch 'hotfix/directory_gap'