refactor to avoid collisions and .gitignore