Restructured the sources