efactoring(static): moved all in static to root