change file structure to match master branch