Minor organization changes

Slightly changed organization and privacy modifiers.