Organize files follow navigation
Merge pull request #247 from minipai/develop

Organize files follow navigation