New file structure organization
Adding renamed files