Re-layout bsc/abstract