move rake to subpackage