Added includes and excludes and moved divider