Changed structure and filenames.