eliminated the base folder