Order class and instance variables
Move constructors to the proper place