Restructured the source packages