reorganization

had to move some stuff around because of the google drive move