reorganized with public directory