Fixed package name and added file headers