fixed imports all around for sectionswap