refactor, changing folder structure