refactoring folder sturcture