Reorganize some files, and start the APIs