reorganized file structure and additional material