Changed class names and moved auto init