Bench system is getting somewhere!

Now, the database and xml-file are both compatible with the new bench
system! Also moved some shit around
and here we go again..