moved from class to inc dir.