[#37] Corrected package declaration, cleaned up references.