Renamed Functions.
Further Restructuring.
Update README.md