Fixed Jobs problem, reorganized #includes