Fix up directory structure and make skeletons for some unit tests