Organized dependencies and updated includes to suit.