Updated structure of project and added imports to __init__.py