incremental changes + folder reorganization