Rework structure for dotcloud