File architecture change!
Merge pull request #10 from LiuJack/master

File architecture change!