Organize code. Update README