couple of small changes in folder stuture