Added a data sub-package and class structure