More structure improvements. Removed outdated/obsolete section.