Update repo structure and cleaned up README