Cleanup cluster.rb and file structure