Fixed package prefixes and copyright headers