Re-organize imports
Use github sources in dependency links, add some missing deps