reorged files, and addred spider
Merge pull request #2 from tinoduong/chore/reorg

Tidying up