Restructured folder to allow async APIs.