Structure and naming changes. To make this somewhat decent for the public.