#664 comment: Moved files around a bit, and created the initial API structure