Converted to proper Python package