Restructure the source