Move package definition to its own file