File renaming and namespace restructure.