Reorg src files to work with a makefile
update elastigo method to v2
Merge pull request #2 from mozilla/code_reorg

Code reorg