New structure and more info in README