Update README and improved files organization