added todo
introduced Base name for overlay
moved generator to lib
moved overlay specific logic to overlay
fixed return point