Tidying up the Public API folder