Refactor machineconsole
Refactor part 2
Tiny bit more refactoring
Skeleton clusterconsole