Moved old classes to deprecated folder.
Fixed interface name for data collection to use the real name instead of the old within Interfaces namespace.