- Source tree restruct