API Test and Directory Cleanup

API Test and Directory Cleanup