merged changes in file structure and file naming