Major changes: structure and names