Cleaned up cluster package layout

is it 2013 or 2014 :)