made some changes to file structure