Re-structure project