Various changes and updates

Move FileIncluder, removed service; move Http to its own package