Moved some of the structures to public