Make and deps changes
Blocks structure