Update all files with new layout and organization