Reorganize container boundaries into sep. dir