Project re-structure, towards a blocks-oriented approach