Improve API folder structure