Preliminary structure (added with commit -u, no garbage)