Folder structure

should be preserved for custom folders per extension as well