Modified folder structure to put block classes in own folder.