Implemented better folder handling
implemented vim support