Major rearrangement
Merge branch 'master' of github.com:RichardEvans/EL