Deleted some old, no longer used files.
Renamed module files.