Isolation

Moved separate assignments to their own folders.