Add some ruby packages and reorganize