Fixed directory names and updated todo