Reworking borders and organization