Add testing and lotto directory, Refine all structure