Restructure text, add some parts