Change file structure, add __init__

Changed the file structure and added __init__ to allow importing