Renames some stuff again, moves some stuff around. Nothing too fancy, still trying to get the hang of PHPUnit