Moved data structures to struct.
Removed unused file.