prepare for multiple APIs (revisit folder structure)