Moved extension classes to inlcudes/

As part of tidying up the code to make it ready for production.

Change-Id: Ib1011fb63810550d011c15850441ae67fc1f4cd2