New folder structure and changes to api