Updated and organized files