Commit working directories for asma & imes

Fixing merging issue due to class conflicts.