Cleanup

Merge all Strings & Arrays in 1 file