cleaned up module hell
refactored endpoint data