New file structure and update to normalize v3