added folders and makefile adjustmenets