Changed folder sturcture