fixed some bad api call
correct directory structure