Code gardening
Move to correct folder
+__init__.py
Move tests
Move tests
Code gardening
More code gardening