Updating formatting and file structure