Minor changes after relocate to lib directory.