some changes to the api file structure