Fixed namespace and file locations.