Ero2 source with restructured package structure