API folder restructure