Add IdGenerator
Move some files around. Break out separate folder for feature extraction