Restructure directory and fix README.md