Added few comments and replace Log.e with Log.i
Merged and removed unused files