Refactor
Fix build
Merge pull request #117 from 28msec/fact-table-refactoring

fact-table refactoring to facts