restrucured working folder