Major Update

[*] Mass Redo of Code
[*] Remove duplicate Code
[*] More according to Android Standards