changed up the file structure