remove un-needed code, update app versiom, and update directory structure