Fix package structure

Fix test running.
Fix executable import statements.