Simplify control flow for drawer
Added process reaping to desks
Renamed files