new structure + new libs