Moving endpoints into endpoint folder