One last re-org to make everything sit nice and pretty in the lab4 folder.