Moved data structures to 'data' package