Added dispose method, renamed package