Restruct sources