complete refactoring
cleaning
Merge pull request #3 from luiscape/fts-api

complete refactoring