Decouple generator library
20140204 last commit in office