rearrange classes / methods