Modify folders to packages