Organize imports
Add numpy dep, change dep links to github