Restructure sources