Changed classes organization