directory structure changes and #57