moved locations to main generator package