rename and rearrange

is rly rly good