Rebuild with proper subdirectories