Move block class out of main