Move to our own package structure