some changes to file structure