moved folders and made placeholder optional