more refactoring
refactoring finished
readme
readme