better folder structure
move main view test to views folder
Merge pull request #1 from kiddkai/master

upmerge