More .h files, move some stuff around