resolves #245: update folder structure