micro refactor and project by name stub