1. rename folder name
2. remove optional api