Restruct the project