Removed unused variables.
Renamed files to better match content