Add license, tweak naming