Changed API folder structure