made some changes folder structure