Get rid of unused things, add other directory