Bring project up to OS standards

Change-Id: Id076465fb00bdb3214704b2f0cadf7ceea5dc31a