shorten some lines
organize files