Reorganization + API folder