updated so that it is all in root dir