Reorganized includes and adjusted Travis config