Reorganize code, and include block class