Change package structure
Fix common depencies