compiles
rename pkgrsrc => pkgfs and move some code again
fix incorrect bundle assignment because of missing return