Realigned a few methods, moved string to container and vectors/matrices to the new section "geometry"