renaming, refactoring
TODO: add .lock files to .gitignore