Add keywords
Remove subdirectories