TODO update; removed separated structure files