Moved class definitions to avoid errors
added fogot classes in __all__ var