reorganized like centro, closes #54