Fix groovy

This patch allows removal of non-empty component directory, which could happen if application_setup recipe is executed a second time (e.g., after a failed attempt). It also adds missing component-moving piece.