various API attribute changes for consistency

plus moved order of attributes/methods within classes for consistency.