Renamed inc file and small changes. Added build target