resolve #5 change folder structure