Renamed files to new namespace and correct namespace