Refactor of folder structure and folder names