Updated package structure
Changing travis config
Fixed broken ci script
Minor stabi;lity improvements
Merging branches into one