refactoring for less noise in main directory