Closes #13 by adding package declarations