Change to Feature structure
Clean up hierarchy of dependencies: blocks, core and features