improved src-packaging