Split out code to include files