Cleaned up Api classes, updated to latest Luvi version