Classes structure completely redifined