Big change in data structure

Issue #1: Implementing Data Api
Big refactoring

Issue #1: Implementing Data Api