restrucured files, finished id puller