Merge physics and math folders