Added some class structure, removed the __init__.py because we dont need them at the moment