Renamed folders to follow cubex naming convention