mixed up cat/cols in a train/test set

Used to test dataset adaption
Build-breaking file move fixes
Remove dead functions

Move more Job fields to the Output class
Work on dataset adaption