better file organization in 3 (put files in 3_1)