Move some extra useless Main-Class-es into their own little package