Organize package into subfolders