moved everything related to data to separate

Signed-off-by: Pankaj Singh <psjinx@gmail.com>