Modified directory structure; fixed incorrect move/copy handler behavior