Code

Completly redo packaging and prepare new upstream version