Renamed files and adjusted includes.