Fix bug changing folder structure