Update to bring up to WP Coding standards

Changes to the way files are included.