Sort out structure
Merge branch 'master' of github.com:Sheepzez/terror-search