Renamed some files and headers for clarity