Fix unnecessary multi-segment function
Move endpoint resources to correct path