Updated to properly (un)concatenate typescript files