Rebuilt the package and filesystem organization