continue refactor to sublime project