Rename imports & add __init__.py to allow for submodule use