refactoring to allow work blocks to sit in subfolders