Working towards making things work again, restructuring pretty much everythig