Changed packages

Changed packages and started to resolve some problems