Renamed STLs, shorter names
Updated file names