Move files into an includes folder

This is the standard way of doing this and makes the
extension's root much less messy.
Also delete the diagrams folder as it doesn't contain
any value.

Change-Id: I4e333cb95023c43556985d8150c7bea0911a2622