Fix class definition so we can require files first
Move initializer after constants and class methods