Implemented ViewHolders for better listview performance
and renamed some classes