Truly fixed it this time, moved some files around