SHTRAK-1 - added time param to track request and organized codebase