file re-arrengment again!
A hot-fixed in getting archive items...
Merge branch 'develop'