Adjustments. Move Basic Blocks to components