Fixed file headers
Fixed dependencies