rearrange folder
bug fix
bug fix, collision speenup