Restructured project.
removed an unnecessary __init__.py