Update README and Re-Organize