Refactored includes so that code is a little more modularised.  Less
clutter in .module - calls are made to supporting include files instead.