restructured imports
code cleanup, docstrings, restructured imports