Test refactoring
refresh the structure a little bit
readme in markdown format