new folders structure, vim design