Refactoring

TODO
1) Map Activitiy (TOM)
2) Graphic Stuff (LORIANA)
3) Payment (TOM)
4) OCR (TOM)
5) ... (LORIANA)