Redo with subdirectories moved to bottom of packages pages