Renamed deprecated file.
Quick and dirty code rewrites.