refactor rake and fix composer