Modifying phone and preparing features

Modifying phone code to use lib, preparing features for classification