Added a bit of package structure