Added proper Apache License Headers