Add some more content
Some restructuration and cleanup