Move files into an includes folder

This is the standard way of doing this and makes the
extension's root much less messy.

Change-Id: If25eae8fa99ea88fae3d9a5de34f4591dc0f7dfc