#34 fixed package declarations