changed up file structure