Internal organization

PAGE UPDATED