reintegrate

readme + refactoring