fixed styles and copyright
merged files