clearify directories, add fabmap