Working algorithm
Add missed files, remove generated files
Solve merge conflicts