ticket:1 change folder structure