Moved classes and helpers out to a .py file - for now