added async callback tracking
reorganized dir structure