updated files and file structure