Redid file structure. Breaks a lot of code.