Updated structure for new version of dotcloud CLI