minor file structure change