Dev partition refactoring