Reworking structure, tests.