Renamed files to match the namespace