Removed unused code
Moved data representation to its own package