Added a second possibility to create the directory and removed the TODO.