Restructure project layout