Simplify structure & readme