Updating file locations to support the new architecture approach.