I messed up renaming majorly when renaming packages, so this is a full
redo of everything exept the code