Add packages

Use proper packaging