fixed endpoint parsing and restructured project structure