Restructure of source