More re-structuring and re-working
New structure complete.