Renamed files to better reflect their functionality