renaming + conflict handling foundation

- change camelcase for file names to snake case
- add a module for conflict handling
fix cli requirements