BRANCH 4.2-DEV: some minor cleanup
BRANCH 4.2-DEV: rearranged classes responsibility a bit for watch drop
folder so that the command class can eventually be made configurable