Start setting up tests. Move directory structure around