Rearrange constructors and classmethods