Complete overhaul of code! 
rearanged packages!

Signed-off-by: Fabian <Fabian@192.168.0.11>