Major reorganisation of sources
Add new sources