reorganizing things a bit and changing the name of the package