added: new directory structure; changed: resolution of capture