changed folder and files structure