Added FIXME ideas + Fixed dir names