Added Listener Package

Also changed a few things