organize dirs and fix build errors
Merge branch 'master' of https://github.com/kingFighter/SnStore